diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 59a96df..2393e16 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -35,6 +35,9 @@
 	// Tags we want the parser to completely ignore when splitting the string.
 	var $inline_elements = 'a|abbr|acronym|b|bdo|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|samp|select|span|strong|sub|sup|textarea|var';
 
+	// whether or not to protect quotes within { curly braces }
+	var $protect_braced_quotes = FALSE;
+	
 	/**
 	 * Nothing to do here...
 	 *
@@ -97,7 +100,20 @@
 									$str);
 			}
 		}
-	
+
+		if ($this->protect_braced_quotes === TRUE)
+		{
+			if (preg_match_all("#\{.+?}#si", $str, $matches))
+			{
+				for ($i = 0; $i < count($matches['0']); $i++)
+				{
+					$str = str_replace($matches['0'][$i],
+										str_replace(array("'",'"'), array('{@SQ}', '{@DQ}'), $matches['0'][$i]),
+										$str);
+				}
+			}			
+		}
+			
 		// Convert "ignore" tags to temporary marker.  The parser splits out the string at every tag 
 		// it encounters.  Certain inline tags, like image tags, links, span tags, etc. will be 
 		// adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG}
diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html
index 359c590..2921905 100644
--- a/user_guide/libraries/typography.html
+++ b/user_guide/libraries/typography.html
@@ -135,6 +135,16 @@
 
 <code>$string = $this->typography->nl2br_except_pre($string);</code>
 
+<h2>protect_braced_quotes</h2>
+
+<p>When using the Typography library in conjunction with the Template Parser library it can often be desirable to protect single
+	and double quotes within curly braces.  To enable this, set the <kbd>protect_braced_quotes</kbd> class property to <samp>TRUE</samp>.
+	
+<p>Usage example:</p>
+
+<code>$this->load->library('typography');<br />
+$this->typography->protect_braced_quotes = TRUE;
+</code>
 
 </div>
 <!-- END CONTENT -->